merge
authorKenichi Handa <handa@m17n.org>
Wed, 24 Aug 2011 07:31:56 +0000 (16:31 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 24 Aug 2011 07:31:56 +0000 (16:31 +0900)

Trivial merge